--- /dev/null
- a63b92f0a8f02b186b5c14c2827c0027a0d637b4
- a63b92f0a8f02b186b5c14c2827c0027a0d637b4
- 7aee3de6fd6bca44751754b10a338947fa947b1c
+# see git-dpm(1) from git-dpm package
++937769ea76b5787bb334678c8685692859128b66
++937769ea76b5787bb334678c8685692859128b66
++4edc7f7569f39278c30a9a64da6e0b313bbed458
+4edc7f7569f39278c30a9a64da6e0b313bbed458
+emacs23_23.4+1.orig.tar.bz2
+155466351ad8e2e10af8a1f7f23af0a801cf7db2
+23111569
--- /dev/null
- From 207579eda5c7603a93d3f0ffed09596850e33ace Mon Sep 17 00:00:00 2001
++From 730582ceef35035f2379283f0b8b7f211194351c Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 4 Apr 2011 22:46:21 -0500
+Subject: Prefer /usr/share/info/emacs-23 over /usr/share/info.
+
+Emacs will prefer /usr/share/info/emacs-23 over /usr/share/info.
+
+The value of Info-default-directory-list has been augmented via
+site-init.el to include /usr/share/info/emacs-23 before
+/usr/share/info.
+---
+ lisp/site-init.el | 11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+ create mode 100644 lisp/site-init.el
+
+diff --git a/lisp/site-init.el b/lisp/site-init.el
+new file mode 100644
+index 0000000..d8d6256
+--- /dev/null
++++ b/lisp/site-init.el
+@@ -0,0 +1,11 @@
++
++;; Add the flavor specific directory for Debian.
++(setq Info-default-directory-list
++ (let ((result nil)
++ (found-match nil))
++ (dolist (elt Info-default-directory-list (nreverse result))
++ (if (and (not found-match) (equal elt "/usr/share/info/"))
++ (progn
++ (push "/usr/share/info/emacs-23" result)
++ (setq found-match t)))
++ (push elt result))))
--- /dev/null
- From 949a2c6776362b398896f819bbac67c0c3a2728b Mon Sep 17 00:00:00 2001
++From 6a31be0e038e528e0d790203851a20e7e6ae4a5a Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 4 Apr 2011 22:46:22 -0500
+Subject: Run debian-startup and set debian-emacs-flavor.
+
+Emacs runs debian-startup and sets debian-emacs-flavor.
+
+* Emacs runs debian-startup during the startup process unless
+ site-run-file is false.
+
+* The global variable debian-emacs-flavor is bound to 'emacs23.
+ Author: Rob Browning <rlb@defaultvalue.org>
+---
+ lisp/startup.el | 21 +++++++++++++++++++--
+ 1 files changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/lisp/startup.el b/lisp/startup.el
- index 471b688..a77e3fa 100644
++index 775d2f7..b3e56ad 100644
+--- a/lisp/startup.el
++++ b/lisp/startup.el
+@@ -393,6 +393,10 @@ Warning Warning!!! Pure space overflow !!!Warning Warning
+ :type 'directory
+ :initialize 'custom-initialize-delay)
+
++(defconst debian-emacs-flavor 'emacs23
++ "A symbol representing the particular debian flavor of emacs running.
++Something like 'emacs20, 'xemacs20, etc.")
++
+ (defun normal-top-level-add-subdirs-to-load-path ()
+ "Add all subdirectories of current directory to `load-path'.
+ More precisely, this uses only the subdirectories whose names
+@@ -955,8 +959,21 @@ opening the first frame (e.g. open a connection to an X server).")
+ ;; be loaded from site-run-file and wants to test if -q was given
+ ;; should check init-file-user instead, since that is already set.
+ ;; See cus-edit.el for an example.
+- (if site-run-file
+- (load site-run-file t t))
++
++ ;; Original upstream startup
++ ;; (if site-run-file
++ ;; (load site-run-file t t))
++ ;;
++
++ ;; Debian startup
++ (if site-run-file
++ (progn
++ ;; Load all the debian package snippets.
++ ;; It's in here because we want -q to kill it too.
++ (if (load "debian-startup" t t nil)
++ (debian-startup debian-emacs-flavor))
++ ;; Now the normal site file...
++ (load site-run-file t t nil)))
+
+ ;; Sites should not disable this. Only individuals should disable
+ ;; the startup screen.
--- /dev/null
- From c182c7be6589ad19958a76596b2d215fb6017ec3 Mon Sep 17 00:00:00 2001
++From c302d1083869a891fe8d75f8ac9be22dcb3e873f Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 4 Apr 2011 22:46:24 -0500
+Subject: Remove files that appear to be incompatible with the DFSG.
+
+Files that appear to be incompatible with the DFSG have been removed.
+
+A number of files have been removed from this package because their
+licenses are not compatible with the Debian Free Software Guidelines
+(DFSG), or because it wasn't completely clear that their licenses are
+compatible.
+
+In particular, all of the files which are covered under the GFDL and
+have invariant sections have been removed in accordance with this
+General Resolution: http://www.debian.org/vote/2006/vote_001.
+
+The files that have been removed, but still appear to be
+distributable, have been moved to packages in Debian's non-free
+section.
+
+Author: Rob Browning <rlb@defaultvalue.org>
+Added-by: Rob Browning <rlb@defaultvalue.org>
+Status: new
+---
+ Makefile.in | 30 +---
+ configure.in | 4 +-
+ doc/misc/Makefile.in | 490 +-------------------------------------------------
+ lisp/help.el | 10 +-
+ 4 files changed, 16 insertions(+), 518 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
- index 32a09ff..41cf979 100644
++index 5e0d128..8162889 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -139,12 +139,7 @@ MAN_PAGES=b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
+ # since there are now many packages documented with the texinfo
+ # system, it is inappropriate to imply that it is part of Emacs.
+ infodir=@infodir@
+-INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse \
+- ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \
+- eshell eudc flymake forms gnus idlwave info mairix-el \
+- message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc \
+- reftex remember sasl sc semantic ses sieve smtpmail speedbar \
+- tramp url vip viper widget woman
++INFO_FILES=efaq
+
+ # Directory for local state files for all programs.
+ localstatedir=@localstatedir@
+@@ -270,7 +265,7 @@ EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'`
+ SUBDIR = lib-src src lisp
+
+ # The subdir makefiles created by config.status.
+-SUBDIR_MAKEFILES = lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile
++SUBDIR_MAKEFILES = lib-src/Makefile doc/misc/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile
+
+ # Subdirectories to install, and where they'll go.
+ # lib-src's makefile knows how to install it, so we don't do that here.
+@@ -357,10 +352,7 @@ Makefile: config.status $(srcdir)/src/config.in \
+ $(srcdir)/Makefile.in \
+ $(srcdir)/src/Makefile.in \
+ $(srcdir)/lib-src/Makefile.in \
+- $(srcdir)/doc/emacs/Makefile.in \
+ $(srcdir)/doc/misc/Makefile.in \
+- $(srcdir)/doc/lispref/Makefile.in \
+- $(srcdir)/doc/lispintro/Makefile.in \
+ $(srcdir)/oldXMenu/Makefile.in \
+ $(srcdir)/lwlib/Makefile.in \
+ $(srcdir)/leim/Makefile.in \
+@@ -701,10 +693,7 @@ mostlyclean: FRC
+ (cd oldXMenu; $(MAKE) $(MFLAGS) mostlyclean)
+ (cd lwlib; $(MAKE) $(MFLAGS) mostlyclean)
+ (cd lib-src; $(MAKE) $(MFLAGS) mostlyclean)
+- -(cd doc/emacs && $(MAKE) $(MFLAGS) mostlyclean)
+ -(cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean)
+- -(cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean)
+- -(cd doc/lispintro && $(MAKE) $(MFLAGS) mostlyclean)
+ (cd leim; $(MAKE) $(MFLAGS) mostlyclean)
+
+ ### `clean'
+@@ -720,10 +709,7 @@ clean: FRC
+ (cd oldXMenu; $(MAKE) $(MFLAGS) clean)
+ (cd lwlib; $(MAKE) $(MFLAGS) clean)
+ (cd lib-src; $(MAKE) $(MFLAGS) clean)
+- -(cd doc/emacs && $(MAKE) $(MFLAGS) clean)
+ -(cd doc/misc && $(MAKE) $(MFLAGS) clean)
+- -(cd doc/lispref && $(MAKE) $(MFLAGS) clean)
+- -(cd doc/lispintro && $(MAKE) $(MFLAGS) clean)
+ (cd leim; $(MAKE) $(MFLAGS) clean)
+
+ ### `bootclean'
+@@ -744,10 +730,7 @@ distclean: FRC
+ (cd oldXMenu; $(MAKE) $(MFLAGS) distclean)
+ (cd lwlib; $(MAKE) $(MFLAGS) distclean)
+ (cd lib-src; $(MAKE) $(MFLAGS) distclean)
+- (cd doc/emacs && $(MAKE) $(MFLAGS) distclean)
+ (cd doc/misc && $(MAKE) $(MFLAGS) distclean)
+- (cd doc/lispref && $(MAKE) $(MFLAGS) distclean)
+- (cd doc/lispintro && $(MAKE) $(MFLAGS) distclean)
+ (cd leim; $(MAKE) $(MFLAGS) distclean)
+ (cd lisp; $(MAKE) $(MFLAGS) distclean)
+ ${top_distclean}
+@@ -760,10 +743,7 @@ bootstrap-clean: FRC
+ (cd oldXMenu; $(MAKE) $(MFLAGS) maintainer-clean)
+ (cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean)
+ (cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean)
+- -(cd doc/emacs && $(MAKE) $(MFLAGS) maintainer-clean)
+ -(cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean)
+- -(cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean)
+- -(cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean)
+ (cd leim; $(MAKE) $(MFLAGS) maintainer-clean)
+ (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
+ ${top_bootclean}
+@@ -808,10 +788,7 @@ dist:
+ .PHONY: info dvi dist check html
+
+ info-real:
+- (cd doc/emacs; $(MAKE) $(MFLAGS) info)
+ (cd doc/misc; $(MAKE) $(MFLAGS) info)
+- (cd doc/lispref; $(MAKE) $(MFLAGS) info)
+- (cd doc/lispintro; $(MAKE) $(MFLAGS) info)
+
+ force-info:
+ # Note that man/Makefile knows how to put the info files in $(srcdir),
+@@ -850,10 +827,7 @@ check-info-dir: info
+ echo "info/dir is OK"
+
+ dvi:
+- (cd doc/emacs; $(MAKE) $(MFLAGS) dvi)
+ (cd doc/misc; $(MAKE) $(MFLAGS) dvi)
+- (cd doc/lispref; $(MAKE) $(MFLAGS) elisp.dvi)
+- (cd doc/lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi)
+
+ #### Bootstrapping.
+
+diff --git a/configure.in b/configure.in
- index 275e812..baacfe4 100644
++index 05b724f..958903d 100644
+--- a/configure.in
++++ b/configure.in
- @@ -3118,8 +3118,8 @@ AC_EGREP_CPP(yes..yes,
++@@ -3123,8 +3123,8 @@ AC_EGREP_CPP(yes..yes,
+ CPP_NEED_TRADITIONAL=yes)
+
+ AC_OUTPUT(Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \
+- doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \
+- doc/lispref/Makefile src/Makefile.c:src/Makefile.in \
++ doc/misc/Makefile \
++ src/Makefile.c:src/Makefile.in \
+ lwlib/Makefile lisp/Makefile leim/Makefile, [
+
+ ### Make the necessary directories, if they don't exist.
+diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
- index 9e93be4..b1dd019 100644
++index 201428e..bcaec12 100644
+--- a/doc/misc/Makefile.in
++++ b/doc/misc/Makefile.in
+@@ -38,104 +38,10 @@ MAKEINFO = makeinfo --force
+
+ # Also add new entries to INFO_FILES in the top-level Makefile.in.
+ INFO_TARGETS = \
+- $(infodir)/ada-mode \
+- $(infodir)/auth \
+- $(infodir)/autotype \
+- $(infodir)/calc \
+- $(infodir)/ccmode \
+- $(infodir)/cl \
+- $(infodir)/dbus \
+- $(infodir)/dired-x \
+- $(infodir)/ebrowse \
+- $(infodir)/ede \
+- $(infodir)/ediff \
+- $(infodir)/edt \
+- $(infodir)/eieio \
+- $(infodir)/emacs-mime \
+- $(infodir)/epa \
+- $(infodir)/erc \
+- $(infodir)/eshell \
+- $(infodir)/eudc \
+- $(infodir)/efaq \
+- $(infodir)/flymake \
+- $(infodir)/forms \
+- $(infodir)/gnus \
+- $(infodir)/idlwave \
+- $(infodir)/info \
+- $(infodir)/mairix-el \
+- $(infodir)/message \
+- $(infodir)/mh-e \
+- $(infodir)/newsticker \
+- $(infodir)/nxml-mode \
+- $(infodir)/org \
+- $(infodir)/pcl-cvs \
+- $(infodir)/pgg \
+- $(infodir)/rcirc \
+- $(infodir)/remember \
+- $(infodir)/reftex \
+- $(infodir)/sasl \
+- $(infodir)/sc \
+- $(infodir)/semantic \
+- $(infodir)/ses \
+- $(infodir)/sieve \
+- $(infodir)/smtpmail \
+- $(infodir)/speedbar \
+- $(infodir)/tramp \
+- $(infodir)/url \
+- $(infodir)/vip \
+- $(infodir)/viper \
+- $(infodir)/widget \
+- $(infodir)/woman
++ $(infodir)/efaq
+
+ DVI_TARGETS = \
+- ada-mode.dvi \
+- auth.dvi \
+- autotype.dvi \
+- calc.dvi \
+- cc-mode.dvi \
+- cl.dvi \
+- dbus.dvi \
+- dired-x.dvi \
+- ebrowse.dvi \
+- ede.dvi \
+- ediff.dvi \
+- edt.dvi \
+- eieio.dvi \
+- emacs-mime.dvi \
+- epa.dvi \
+- erc.dvi \
+- eshell.dvi \
+- eudc.dvi \
+- faq.dvi \
+- flymake.dvi \
+- forms.dvi \
+- gnus.dvi \
+- idlwave.dvi \
+- info.dvi \
+- mairix-el.dvi \
+- message.dvi \
+- mh-e.dvi \
+- newsticker.dvi \
+- nxml-mode.dvi \
+- org.dvi \
+- pcl-cvs.dvi \
+- pgg.dvi \
+- rcirc.dvi \
+- reftex.dvi \
+- remember.dvi \
+- sasl.dvi \
+- sc.dvi \
+- semantic.dvi \
+- ses.dvi \
+- sieve.dvi \
+- smtpmail.dvi \
+- speedbar.dvi \
+- tramp.dvi \
+- url.dvi \
+- vip.dvi \
+- viper.dvi \
+- widget.dvi \
+- woman.dvi
++ faq.dvi
+
+ PDF_TARGETS = \
+ ada-mode.pdf \
+@@ -198,10 +104,7 @@ TEXI2PDF = texi2pdf
+ ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
+
+
+-info: $(infodir) $(INFO_TARGETS)
+-
+-$(infodir):
+- mkdir $@
++info: $(INFO_TARGETS)
+
+ dvi: $(DVI_TARGETS)
+
+@@ -213,150 +116,6 @@ pdf: $(PDF_TARGETS)
+ # In a distribution of Emacs, the Info files should be up to date.
+
+ ## "short" target names for convenience, to just rebuild one manual.
+-ada-mode : $(infodir)/ada-mode
+-$(infodir)/ada-mode: ada-mode.texi
+- cd $(srcdir); $(MAKEINFO) ada-mode.texi
+-ada-mode.dvi: ada-mode.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi
+-ada-mode.pdf: ada-mode.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/ada-mode.texi
+-
+-auth : $(infodir)/auth
+-$(infodir)/auth: auth.texi
+- cd $(srcdir); $(MAKEINFO) auth.texi
+-auth.dvi: auth.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/auth.texi
+-auth.pdf: auth.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/auth.texi
+-
+-autotype : $(infodir)/autotype
+-$(infodir)/autotype: autotype.texi
+- cd $(srcdir); $(MAKEINFO) autotype.texi
+-autotype.dvi: autotype.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi
+-autotype.pdf: autotype.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi
+-
+-calc : $(infodir)/calc
+-$(infodir)/calc: calc.texi
+- cd $(srcdir); $(MAKEINFO) calc.texi
+-calc.dvi: calc.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi
+-calc.pdf: calc.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/calc.texi
+-
+-ccmode : $(infodir)/ccmode
+-$(infodir)/ccmode: cc-mode.texi
+- cd $(srcdir); $(MAKEINFO) cc-mode.texi
+-cc-mode.dvi: cc-mode.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi
+-cc-mode.pdf: cc-mode.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/cc-mode.texi
+-
+-cl : $(infodir)/cl
+-$(infodir)/cl: cl.texi
+- cd $(srcdir); $(MAKEINFO) cl.texi
+-cl.dvi: cl.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi
+-cl.pdf: cl.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/cl.texi
+-
+-dbus : $(infodir)/dbus
+-$(infodir)/dbus: dbus.texi
+- cd $(srcdir); $(MAKEINFO) dbus.texi
+-dbus.dvi: dbus.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/dbus.texi
+-dbus.pdf: dbus.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/dbus.texi
+-
+-dired-x : $(infodir)/dired-x
+-$(infodir)/dired-x: dired-x.texi
+- cd $(srcdir); $(MAKEINFO) dired-x.texi
+-dired-x.dvi: dired-x.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi
+-dired-x.pdf: dired-x.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/dired-x.texi
+-
+-ebrowse : $(infodir)/ebrowse
+-$(infodir)/ebrowse: ebrowse.texi
+- cd $(srcdir); $(MAKEINFO) ebrowse.texi
+-ebrowse.dvi: ebrowse.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi
+-ebrowse.pdf: ebrowse.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/ebrowse.texi
+-
+-ede : $(infodir)/ede
+-$(infodir)/ede: ede.texi
+- cd $(srcdir); $(MAKEINFO) ede.texi
+-ede.dvi: ede.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ede.texi
+-ede.pdf: ede.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/ede.texi
+-
+-ediff : $(infodir)/ediff
+-$(infodir)/ediff: ediff.texi
+- cd $(srcdir); $(MAKEINFO) ediff.texi
+-ediff.dvi: ediff.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi
+-ediff.pdf: ediff.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi
+-
+-edt : $(infodir)/edt
+-$(infodir)/edt: edt.texi
+- cd $(srcdir); $(MAKEINFO) edt.texi
+-edt.dvi: edt.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/edt.texi
+-edt.pdf: edt.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/edt.texi
+-
+-eieio : $(infodir)/eieio
+-$(infodir)/eieio: eieio.texi
+- cd $(srcdir); $(MAKEINFO) eieio.texi
+-eieio.dvi: eieio.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/eieio.texi
+-eieio.pdf: eieio.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/eieio.texi
+-
+-emacs-mime : $(infodir)/emacs-mime
+-$(infodir)/emacs-mime: emacs-mime.texi
+- cd $(srcdir); $(MAKEINFO) --enable-encoding emacs-mime.texi
+-emacs-mime.dvi: emacs-mime.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi
+-emacs-mime.pdf: emacs-mime.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-mime.texi
+-
+-epa : $(infodir)/epa
+-$(infodir)/epa: epa.texi
+- cd $(srcdir); $(MAKEINFO) epa.texi
+-epa.dvi: epa.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi
+-epa.pdf: epa.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi
+-
+-erc : $(infodir)/erc
+-$(infodir)/erc: erc.texi
+- cd $(srcdir); $(MAKEINFO) erc.texi
+-erc.dvi: erc.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi
+-erc.pdf: erc.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi
+-
+-eshell : $(infodir)/eshell
+-$(infodir)/eshell: eshell.texi
+- cd $(srcdir); $(MAKEINFO) eshell.texi
+-eshell.dvi: eshell.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi
+-eshell.pdf: eshell.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/eshell.texi
+-
+-eudc : $(infodir)/eudc
+-$(infodir)/eudc: eudc.texi
+- cd $(srcdir); $(MAKEINFO) eudc.texi
+-eudc.dvi: eudc.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi
+-eudc.pdf: eudc.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/eudc.texi
+-
+ efaq : $(infodir)/efaq
+ $(infodir)/efaq: faq.texi
+ cd $(srcdir); $(MAKEINFO) faq.texi
+@@ -365,249 +124,6 @@ faq.dvi: faq.texi
+ faq.pdf: faq.texi
+ $(ENVADD) $(TEXI2PDF) ${srcdir}/faq.texi
+
+-flymake : $(infodir)/flymake
+-$(infodir)/flymake: flymake.texi
+- cd $(srcdir); $(MAKEINFO) flymake.texi
+-flymake.dvi: flymake.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi
+-flymake.pdf: flymake.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/flymake.texi
+-
+-forms : $(infodir)/forms
+-$(infodir)/forms: forms.texi
+- cd $(srcdir); $(MAKEINFO) forms.texi
+-forms.dvi: forms.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi
+-forms.pdf: forms.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/forms.texi
+-
+-# gnus/message/emacs-mime/sieve/pgg are part of Gnus:
+-gnus : $(infodir)/gnus
+-$(infodir)/gnus: gnus.texi gnus-faq.texi
+- cd $(srcdir); $(MAKEINFO) gnus.texi
+-gnus.dvi: gnus.texi gnus-faq.texi
+- sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
+- $(ENVADD) $(TEXI2DVI) gnustmp.texi
+- cp gnustmp.dvi $*.dvi
+- rm gnustmp.*
+-gnus.pdf: gnus.texi gnus-faq.texi
+- sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
+- $(ENVADD) $(TEXI2PDF) gnustmp.texi
+- cp gnustmp.pdf $@
+- rm gnustmp.*
+-
+-# This is produced with --no-split to avoid making files whose
+-# names clash on DOS 8+3 filesystems
+-idlwave : $(infodir)/idlwave
+-$(infodir)/idlwave: idlwave.texi
+- cd $(srcdir); $(MAKEINFO) --no-split idlwave.texi
+-idlwave.dvi: idlwave.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi
+-idlwave.pdf: idlwave.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/idlwave.texi
+-
+-# The following target uses an explicit -o switch to work around
+-# the @setfilename directive in info.texi, which is required for
+-# the Texinfo distribution.
+-###info : $(infodir)/info # circular!
+-$(infodir)/info: info.texi
+- cd $(srcdir); $(MAKEINFO) --no-split info.texi -o $@
+-info.dvi: info.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
+-info.pdf: info.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/info.texi
+-
+-mairix-el : $(infodir)/mairix-el
+-$(infodir)/mairix-el: mairix-el.texi
+- cd $(srcdir); $(MAKEINFO) mairix-el.texi
+-mairix-el.dvi: mairix-el.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/mairix-el.texi
+-mairix-el.pdf: mairix-el.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/mairix-el.texi
+-
+-message : $(infodir)/message
+-$(infodir)/message: message.texi
+- cd $(srcdir); $(MAKEINFO) message.texi
+-message.dvi: message.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi
+-message.pdf: message.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/message.texi
+-
+-mh-e : $(infodir)/mh-e
+-$(infodir)/mh-e: mh-e.texi
+- cd $(srcdir); $(MAKEINFO) mh-e.texi
+-mh-e.dvi: mh-e.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
+-mh-e.pdf: mh-e.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/mh-e.texi
+-
+-newsticker : $(infodir)/newsticker
+-$(infodir)/newsticker: newsticker.texi
+- cd $(srcdir); $(MAKEINFO) newsticker.texi
+-newsticker.dvi: newsticker.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
+-newsticker.pdf: newsticker.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/newsticker.texi
+-
+-nxml-mode : $(infodir)/nxml-mode
+-$(infodir)/nxml-mode: nxml-mode.texi
+- cd $(srcdir); $(MAKEINFO) nxml-mode.texi
+-nxml-mode.dvi: nxml-mode.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi
+-nxml-mode.pdf: nxml-mode.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/nxml-mode.texi
+-
+-org : $(infodir)/org
+-$(infodir)/org: org.texi
+- cd $(srcdir); $(MAKEINFO) org.texi
+-org.dvi: org.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi
+-org.pdf: org.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/org.texi
+-
+-pcl-cvs : $(infodir)/pcl-cvs
+-$(infodir)/pcl-cvs: pcl-cvs.texi
+- cd $(srcdir); $(MAKEINFO) pcl-cvs.texi
+-pcl-cvs.dvi: pcl-cvs.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi
+-pcl-cvs.pdf: pcl-cvs.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/pcl-cvs.texi
+-
+-pgg : $(infodir)/pgg
+-$(infodir)/pgg: pgg.texi
+- cd $(srcdir); $(MAKEINFO) pgg.texi
+-pgg.dvi: pgg.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi
+-pgg.pdf: pgg.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/pgg.texi
+-
+-rcirc : $(infodir)/rcirc
+-$(infodir)/rcirc: rcirc.texi
+- cd $(srcdir); $(MAKEINFO) rcirc.texi
+-rcirc.dvi: rcirc.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi
+-rcirc.pdf: rcirc.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi
+-
+-reftex : $(infodir)/reftex
+-$(infodir)/reftex: reftex.texi
+- cd $(srcdir); $(MAKEINFO) reftex.texi
+-reftex.dvi: reftex.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi
+-reftex.pdf: reftex.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi
+-
+-remember : $(infodir)/remember
+-$(infodir)/remember: remember.texi
+- cd $(srcdir); $(MAKEINFO) remember.texi
+-remember.dvi: remember.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/remember.texi
+-remember.pdf: remember.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/remember.texi
+-
+-sasl : $(infodir)/sasl
+-$(infodir)/sasl: sasl.texi
+- cd $(srcdir); $(MAKEINFO) sasl.texi
+-sasl.dvi: sasl.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/sasl.texi
+-sasl.pdf: sasl.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/sasl.texi
+-
+-sc : $(infodir)/sc
+-$(infodir)/sc: sc.texi
+- cd $(srcdir); $(MAKEINFO) sc.texi
+-sc.dvi: sc.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi
+-sc.pdf: sc.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/sc.texi
+-
+-semantic : $(infodir)/semantic
+-$(infodir)/semantic: semantic.texi sem-user.texi
+- cd $(srcdir); $(MAKEINFO) semantic.texi
+-semantic.dvi: semantic.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/semantic.texi
+-semantic.pdf: semantic.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/semantic.texi
+-
+-ses : $(infodir)/ses
+-$(infodir)/ses: ses.texi
+- cd $(srcdir); $(MAKEINFO) ses.texi
+-ses.dvi: ses.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi
+-ses.pdf: ses.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/ses.texi
+-
+-sieve : $(infodir)/sieve
+-$(infodir)/sieve: sieve.texi
+- cd $(srcdir); $(MAKEINFO) sieve.texi
+-sieve.dvi: sieve.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi
+-sieve.pdf: sieve.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/sieve.texi
+-
+-smtpmail : $(infodir)/smtpmail
+-$(infodir)/smtpmail: smtpmail.texi
+- cd $(srcdir); $(MAKEINFO) smtpmail.texi
+-smtpmail.dvi: smtpmail.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi
+-smtpmail.pdf: smtpmail.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/smtpmail.texi
+-
+-speedbar : $(infodir)/speedbar
+-$(infodir)/speedbar: speedbar.texi
+- cd $(srcdir); $(MAKEINFO) speedbar.texi
+-speedbar.dvi: speedbar.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi
+-speedbar.pdf: speedbar.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/speedbar.texi
+-
+-tramp : $(infodir)/tramp
+-$(infodir)/tramp: tramp.texi trampver.texi
+- cd $(srcdir); $(MAKEINFO) -D emacs tramp.texi
+-tramp.dvi: tramp.texi trampver.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi
+-tramp.pdf: tramp.texi trampver.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/tramp.texi
+-
+-url : $(infodir)/url
+-$(infodir)/url: url.texi
+- cd $(srcdir); $(MAKEINFO) url.texi
+-url.dvi: url.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi
+-url.pdf: url.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/url.texi
+-
+-vip : $(infodir)/vip
+-$(infodir)/vip: vip.texi
+- cd $(srcdir); $(MAKEINFO) vip.texi
+-vip.dvi: vip.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi
+-vip.pdf: vip.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/vip.texi
+-
+-viper : $(infodir)/viper
+-$(infodir)/viper: viper.texi
+- cd $(srcdir); $(MAKEINFO) viper.texi
+-viper.dvi: viper.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi
+-viper.pdf: viper.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/viper.texi
+-
+-widget : $(infodir)/widget
+-$(infodir)/widget: widget.texi
+- cd $(srcdir); $(MAKEINFO) widget.texi
+-widget.dvi: widget.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi
+-widget.pdf: widget.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/widget.texi
+-
+-woman : $(infodir)/woman
+-$(infodir)/woman: woman.texi
+- cd $(srcdir); $(MAKEINFO) woman.texi
+-woman.dvi: woman.texi
+- $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi
+-woman.pdf: woman.texi
+- $(ENVADD) $(TEXI2PDF) ${srcdir}/woman.texi
+
+
+ mostlyclean:
+diff --git a/lisp/help.el b/lisp/help.el
- index 97690ea..482b4a1 100644
++index 84692c4..6d96e57 100644
+--- a/lisp/help.el
++++ b/lisp/help.el
+@@ -301,6 +301,14 @@ If that doesn't give a function, return nil."
+ (goto-address-mode 1)
+ (goto-char (point-min)))
+
++(defun debian-expand-file-name-dfsg (filename)
++ "Apply expand-file-name to FILENAME.
++If expand-file-name does not find a file, append `.dfsg' and try again."
++ (let ((file (expand-file-name filename data-directory)))
++ (if (file-exists-p file)
++ file
++ (expand-file-name (concat file ".dfsg") data-directory))))
++
+ (defun describe-distribution ()
+ "Display info on how to obtain the latest version of GNU Emacs."
+ (interactive)
+@@ -314,7 +322,7 @@ If that doesn't give a function, return nil."
+ (defun describe-gnu-project ()
+ "Display info on the GNU project."
+ (interactive)
+- (view-help-file "THE-GNU-PROJECT"))
++ (view-help-file (debian-expand-file-name-dfsg "THE-GNU-PROJECT")))
+
+ (define-obsolete-function-alias 'describe-project 'describe-gnu-project "22.2")
+
--- /dev/null
- From 173ac6bf5b4001dee0bf22491df502c6e4d12588 Mon Sep 17 00:00:00 2001
++From 99c51fcfe11469feff7e943ab783ddab7f75fcd2 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 4 Apr 2011 22:46:25 -0500
+Subject: Adjust documentation references for Debian.
+
+Various documentation references have been adjusted for Debian.
+
+References to /usr/local/... have been changed to /usr/... as
+appropriate, etc.
+---
+ etc/NEWS | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/etc/NEWS b/etc/NEWS
- index 7c5c4be..ef968cf 100644
++index 136bdf1..bb5f6b3 100644
+--- a/etc/NEWS
++++ b/etc/NEWS
+@@ -14,6 +14,11 @@ for changes in older Emacs versions.
+ You can narrow news to a specific version by calling `view-emacs-news'
+ with a prefix argument or by typing C-u C-h C-n.
+
++ \f
++* Debian specific changes to Emacs
++
++Please see /usr/share/doc/emacs23-common/README.Debian.gz.
++
+ \f
- * Installation Changes in Emacs 23.3
++ * Installation Changes in Emacs 23.4
+
--- /dev/null
- From 0f624911022e9a8a544eb527054c6178fe713100 Mon Sep 17 00:00:00 2001
++From e8cb9f40dca14735f4c5f20aefd5c8371cea5ed2 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 4 Apr 2011 22:46:26 -0500
+Subject: Cause the build to fail if liblockfile isn't selected for movemail.
+
+The build will fail if liblockfile isn't selected for movemail.
+
+This makes sure the Debian Emacs won't accidentally be built with the
+wrong locking strategy. To disable this check, comment out
+require-movemail-use-liblockfile.diff in debian/patches/series.
+
+Author: Rob Browning <rlb@defaultvalue.org>
+Added-by: Rob Browning <rlb@defaultvalue.org>
+---
+ lib-src/movemail.c | 4 ++++
+ src/s/bsd-common.h | 4 ++++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/lib-src/movemail.c b/lib-src/movemail.c
- index 5fcc6de..58add49 100644
++index d6fc1ce..ec38678 100644
+--- a/lib-src/movemail.c
++++ b/lib-src/movemail.c
+@@ -166,6 +166,10 @@ int mbx_delimit_end ();
+ /* Nonzero means this is name of a lock file to delete on fatal error. */
+ char *delete_lockname;
+
++#ifndef MAIL_USE_MAILLOCK
++#error "Debian requires that mail locking be handled by liblockfile."
++#endif /* ndef MAIL_USE_MAILLOCK */
++
+ int
+ main (argc, argv)
+ int argc;
+diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
- index 7889255..56fcb4a 100644
++index 4179d33..70a4a1a 100644
+--- a/src/s/bsd-common.h
++++ b/src/s/bsd-common.h
+@@ -66,7 +66,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
+ The alternative is that a lock file named
+ /usr/spool/mail/$USER.lock. */
+
++/* conditional copied from gnu-linux.h */
++#if !((defined (HAVE_LIBMAIL) || defined (HAVE_LIBLOCKFILE)) && \
++ defined (HAVE_MAILLOCK_H))
+ #define MAIL_USE_FLOCK
++#endif
+
+ /* Define CLASH_DETECTION if you want lock files to be written
+ so that Emacs can tell instantly when you try to modify
--- /dev/null
- From 7ab2699f68cd8227e58bc2177cc48b4239eb929e Mon Sep 17 00:00:00 2001
++From 7e090e5d4e3efa4990b7b404c6dfed1808e28455 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 4 Apr 2011 22:46:27 -0500
+Subject: Avoid silently losing mail via fakemail.
+
+An attempt is made to avoid silently losing mail via fakemail.
+
+This fix attempts to avoid a situation where Emacs can silently lose
+mail. This can occur if sendmail.el (at least) falls back to
+fakemail, and the underlying binary (MAIL_PROGRAM_NAME) that fakemail
+is configured to use doesn't exist. Unless mail-interactive is true,
+Emacs won't wait for the mailer and so won't know that fakemail
+failed.
+
+For now, Debian sets fakemail's MAIL_PROGRAM_NAME to /usr/bin/mail
+(which is the correct value for Debian systems) rather than /bin/mail.
+Debian also adjusts Emacs to test whether or not /usr/bin/mail exists
+and is executable. If either of these tests fail, then
+mail-interactive is set to t. That should ensure that a user will
+actually see an error if they attempt to use the broken fakemail.
+
+Note that Debian actually forces the MAIL_PROGRAM_NAME value to
+/usr/bin/mail. The build will fail if any other value is specified.
+This is done to ensure that MAIL_PROGRAM_NAME isn't accidentally set
+to some other value during the build process. If this is undesirable
+for some reason, just comment out avoid-fakemail-loss.diff in
+debian/patches/series.
+
+Author: Rob Browning <rlb@defaultvalue.org>
+Added-by: Rob Browning <rlb@defaultvalue.org>
+---
+ lib-src/fakemail.c | 6 ++++--
+ lisp/gnus/message.el | 8 +++++++-
+ lisp/mail/feedmail.el | 7 ++++++-
+ lisp/mail/sendmail.el | 7 ++++++-
+ 4 files changed, 23 insertions(+), 5 deletions(-)
+
+diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
- index f83c0fb..5c5fb6d 100644
++index cebd8d7..5edb360 100644
+--- a/lib-src/fakemail.c
++++ b/lib-src/fakemail.c
+@@ -136,8 +136,10 @@ struct linebuffer lb;
+ #define NIL ((line_list) NULL)
+ #define INITIAL_LINE_SIZE 200
+
+-#ifndef MAIL_PROGRAM_NAME
+-#define MAIL_PROGRAM_NAME "/bin/mail"
++#ifdef MAIL_PROGRAM_NAME
++#error "Debian assumption violated -- see avoid-fakemail-mail-loss.diff"
++#else
++#define MAIL_PROGRAM_NAME "/usr/bin/mail"
+ #endif
+
+ static char *my_name;
+diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
- index 63fcf50..d6a417a 100644
++index 318e34f..1b6a9df 100644
+--- a/lisp/gnus/message.el
++++ b/lisp/gnus/message.el
+@@ -4609,7 +4609,13 @@ If you always want Gnus to send messages in one piece, set
+ "/usr/lib/sendmail")
+ ((file-exists-p "/usr/ucblib/sendmail")
+ "/usr/ucblib/sendmail")
+- (t "fakemail"))
++ (t
++ (if (not (file-executable-p
++ "/usr/bin/mail"))
++ (progn
++ (message "/usr/bin/mail is not an executable. Setting mail-interactive to t.")
++ (setq mail-interactive t)))
++ "fakemail"))
+ nil errbuf nil "-oi")
+ message-sendmail-extra-arguments
+ ;; Always specify who from,
+diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
+index 77d82f6..29cc891 100644
+--- a/lisp/mail/feedmail.el
++++ b/lisp/mail/feedmail.el
+@@ -1327,7 +1327,12 @@ complicated cases."
+ "/usr/lib/sendmail")
+ ((file-exists-p "/usr/ucblib/sendmail")
+ "/usr/ucblib/sendmail")
+- (t "fakemail"))
++ (t
++ (if (not (file-executable-p "/usr/bin/mail"))
++ (progn
++ (message "/usr/bin/mail is not an executable. Setting mail-interactive to t.")
++ (setq mail-interactive t)))
++ "fakemail"))
+ nil errors-to nil "-oi" "-t")
+ ;; provide envelope "from" to sendmail; results will vary
+ (list "-f" user-mail-address)
+diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
- index 8cd6503..1adc2ca 100644
++index e6e49c4..4705f61 100644
+--- a/lisp/mail/sendmail.el
++++ b/lisp/mail/sendmail.el
+@@ -52,7 +52,12 @@
+ ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail")
+ ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail")
+ ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail")
+- (t "fakemail")) ;In ../etc, to interface to /bin/mail.
++ (t
++ (if (not (file-executable-p "/usr/bin/mail"))
++ (progn
++ (message "/usr/bin/mail is not an executable. Setting mail-interactive to t.")
++ (setq mail-interactive t)))
++ "fakemail")) ;In ../etc, to interface to /bin/mail.
+ "Program used to send messages."
+ :group 'mail
+ :type 'file)
--- /dev/null
- From d72d66a692c002d0216f986ad4d76fa4eaaabc5d Mon Sep 17 00:00:00 2001
++From ace4b4626bfb0bfc2b0b4afce210c086afa86bbf Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 4 Apr 2011 22:46:28 -0500
+Subject: Modify the output of (version) to indicate Debian modifications.
+
+The output of (version) has been modified to indicate Debian modifications.
+
+Author: Rob Browning <rlb@defaultvalue.org>
+Added-by: Rob Browning <rlb@defaultvalue.org>
+---
+ lisp/version.el | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lisp/version.el b/lisp/version.el
- index 92eb564..f9103b1 100644
++index ebd4fea..b8107e6 100644
+--- a/lisp/version.el
++++ b/lisp/version.el
+@@ -56,8 +56,8 @@ to the system configuration; look at `system-configuration' instead."
+ (interactive "P")
+ (let ((version-string
+ (format (if (not (called-interactively-p 'interactive))
+- "GNU Emacs %s (%s%s%s)\n of %s on %s"
+- "GNU Emacs %s (%s%s%s) of %s on %s")
++ "GNU Emacs %s (%s%s%s)\n of %s on %s, modified by Debian"
++ "GNU Emacs %s (%s%s%s) of %s on %s, modified by Debian")
+ emacs-version
+ system-configuration
+ (cond ((featurep 'motif)
--- /dev/null
- From 0d990c036114c29958aa694f5d57a1d49ab07254 Mon Sep 17 00:00:00 2001
++From 54e9d1a87ea67bd2ae5933bd9c1542cb2803bcf8 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 4 Apr 2011 22:46:29 -0500
+Subject: Look for NEWS in order to find etc/ rather than GNU.
+
+Emacs will now look for NEWS in order to find etc/ rather than GNU.
+
+Since Debian doesn't include GNU in the Debian packages (the common
+licenses are in /usr/share/common-licenses), Emacs will now look for
+NEWS to find the etc directory instead of GNU.
+
+Provided-by: Sven Joachim <svenjoac@gmx.de>
+Originally-reported-by: Bernhard Michler <Boregard@gmx.net>
+Date: Mon, 28 Apr 2008 11:20:23 +0200
+Added-by: Rob Browning <rlb@defaultvalue.org>
+Status: Debian specific
+---
+ src/callproc.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/callproc.c b/src/callproc.c
- index ffb7a7c..812c345 100644
++index 6898bd9..84b1c30 100644
+--- a/src/callproc.c
++++ b/src/callproc.c
+@@ -1509,14 +1509,14 @@ init_callproc ()
+
+ srcdir = Fexpand_file_name (build_string ("../src/"),
+ build_string (PATH_DUMPLOADSEARCH));
+- tem = Fexpand_file_name (build_string ("GNU"), Vdata_directory);
++ tem = Fexpand_file_name (build_string ("NEWS"), Vdata_directory);
+ tem1 = Ffile_exists_p (tem);
+ if (!NILP (Fequal (srcdir, Vinvocation_directory)) || NILP (tem1))
+ {
+ Lisp_Object newdir;
+ newdir = Fexpand_file_name (build_string ("../etc/"),
+ build_string (PATH_DUMPLOADSEARCH));
+- tem = Fexpand_file_name (build_string ("GNU"), newdir);
++ tem = Fexpand_file_name (build_string ("NEWS"), newdir);
+ tem1 = Ffile_exists_p (tem);
+ if (!NILP (tem1))
+ Vdata_directory = newdir;
--- /dev/null
- From 13c08a7c91dfd6a6334d7f06d2e7b1dbb7bfb208 Mon Sep 17 00:00:00 2001
++From 5b1eadbfa938bc5dc8e623ece55dbc378e70ce3f Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 4 Apr 2011 22:46:30 -0500
+Subject: Invoke the correct xmlstarlet executable on Debian systems.
+
+Emacs now invokes the correct xmlstarlet executable on Debian systems.
+
+Emacs invokes xmlstarlet rather than xml, which is the correct
+executable name on Debian systems.
+
+Provided-by: Jussi Judin <jjudin+debian@iki.fi>
+Date: Sat, 20 Oct 2007 14:42:02 UTC
+Added-by: Rob Browning <rlb@defaultvalue.org>
+Status: Debian specific
+Bug: 447378
+---
+ lisp/progmodes/flymake.el | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
- index da28a2e..81f6017 100644
++index de7034f..4d21371 100644
+--- a/lisp/progmodes/flymake.el
++++ b/lisp/progmodes/flymake.el
+@@ -1760,7 +1760,7 @@ Use CREATE-TEMP-F for creating temp copy."
+
+ ;;;; xml-specific init-cleanup routines
+ (defun flymake-xml-init ()
+- (list "xml" (list "val" (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace))))
++ (list "xmlstarlet" (list "val" (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace))))
+
+ (provide 'flymake)
+
--- /dev/null
- From feae0003be258bfed4dee8d6706462a0624068da Mon Sep 17 00:00:00 2001
++From f4f49db3a1e1868f269d33ae69c2b52b2b8f8f06 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 4 Apr 2011 22:46:32 -0500
+Subject: Fix startup hang on Debian GNU/kFreeBSD.
+
+Emacs should no longer hang on startup on Debian GNU/kFreeBSD.
+
+Date: Thu Aug 12 04:21:09 UTC 2010
+Added-by: Rob Browning <rlb@defaultvalue.org>
+Provided-By: Petr Salinger <Petr.Salinger@seznam.cz>
+Bug: 559392
+Status: new
+---
+ src/s/gnu-kfreebsd.h | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/src/s/gnu-kfreebsd.h b/src/s/gnu-kfreebsd.h
+index a1e8c02..89563de 100644
+--- a/src/s/gnu-kfreebsd.h
++++ b/src/s/gnu-kfreebsd.h
+@@ -5,6 +5,11 @@
+ #undef SYSTEM_TYPE
+ #define SYSTEM_TYPE "gnu/kfreebsd" /* All the best software is free */
+
++#undef INTERRUPT_INPUT
++#define BROKEN_SIGIO
++#define BROKEN_SIGURG
++#define BROKEN_SIGPOLL
++
+ #define NO_TERMIO /* use only <termios.h> */
+
+ /* arch-tag: 8d098200-2586-469e-99ab-6d092c035e03
--- /dev/null
--- /dev/null
++From 28f48aed44b1c58dcb75142f3b261cd99d074fde Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Tue, 25 Oct 2011 19:52:51 -0500
++Subject: Use CRT_DIR to find crt*.o on ppc64.
++
++The Emacs build should now look for crt*.o in the correct multiarch
++location during ppc64 builds.
++
++Provided-by: Hiroyuki Yamamoto <yama1066@gmail.com>
++Date: Wed, 26 Oct 2011 01:39:35 +0900
++Applied-by: Rob Browning <rlb@defaultvalue.org>
++Bug-Debian: http://bugs.debian.org/646609
++---
++ configure.in | 8 ++++----
++ src/m/macppc.h | 4 ++--
++ 2 files changed, 6 insertions(+), 6 deletions(-)
++
++diff --git a/configure.in b/configure.in
++index 958903d..75af0f7 100644
++--- a/configure.in
+++++ b/configure.in
++@@ -172,7 +172,7 @@ fi
++ CRT_DIR=
++ AC_ARG_WITH([crt-dir],dnl
++ [AS_HELP_STRING([--with-crt-dir=DIR],[directory containing crtn.o etc.
++-This option is only used on x86-64 and s390x GNU/Linux architectures.])])
+++This option is only used on x86-64, powerpc64 and s390x GNU/Linux architectures.])])
++ CRT_DIR="${with_crt_dir}"
++
++ AC_ARG_WITH([gnustep-conf],dnl
++@@ -1006,11 +1006,11 @@ AC_CONFIG_LIBOBJ_DIR(src)
++ dnl Do this early because it can frob feature test macros for Unix-98 &c.
++ AC_SYS_LARGEFILE
++
++-## Note: at present CRT_DIR is only used for amdx86-64 and ibms390x.
+++## Note: at present CRT_DIR is only used for amdx86-64, powerpc64 and ibms390x.
++ ## Other machine types hard-code the location in src/[ms]/*.h.
++ case "${canonical}" in
++- x86_64-*-linux-gnu* | s390x-*-linux-gnu* )
++- ## On x86-64 and s390x GNU/Linux distributions, the standard library
+++ x86_64-*-linux-gnu* | powerpc64-*-linux-gnu* | s390x-*-linux-gnu* )
+++ ## On x86-64, powerpc64 and s390x GNU/Linux distributions, the standard library
++ ## can be in a variety of places. We only try /usr/lib64 and /usr/lib.
++ ## For anything else (eg /usr/lib32), it is up the user to specify
++ ## the location (bug#5655).
++diff --git a/src/m/macppc.h b/src/m/macppc.h
++index 810c62a..17dc9d3 100644
++--- a/src/m/macppc.h
+++++ b/src/m/macppc.h
++@@ -50,9 +50,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
++ #define LD_SWITCH_MACHINE_TEMACS -Xlinker -znocombreloc
++ #ifdef _ARCH_PPC64
++ #undef START_FILES
++-#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
+++#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o
++ #undef LIB_STANDARD
++-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
+++#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o
++ #endif
++ #endif
++
--- /dev/null
--- /dev/null
++From 8a1d66b717aedf49c61b56b2ad3ce2d3ba9b7ce7 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Sun, 29 Jan 2012 13:34:44 -0600
++Subject: Define POSIX_SIGNALS for GNU/Hurd.
++
++Emacs will now use POSIX signals on GNU/Hurd which avoids a build
++failure when a 15MiB-long write is interrupted by a signal, and Emacs
++hasn't set the SA_RESTART flag.
++
++Author: Samuel Thibault <sthibault@debian.org>
++Date: Sun, 4 Dec 2011 19:47:54 +0100
++Applied-By: Rob Browning <rlb@defaultvalue.org>
++Forwarded: bug-gnu-emacs@gnu.org
++Closes: #650976
++---
++ src/s/gnu.h | 2 ++
++ 1 files changed, 2 insertions(+), 0 deletions(-)
++
++diff --git a/src/s/gnu.h b/src/s/gnu.h
++index 388b3e3..51e6ec4 100644
++--- a/src/s/gnu.h
+++++ b/src/s/gnu.h
++@@ -83,5 +83,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
++ #endif /* !_IO_STDIO_H */
++ #endif /* emacs */
++
+++#define POSIX_SIGNALS 1
+++
++ /* arch-tag: 577983d9-87a6-4922-b8f8-ff2b563714a4
++ (do not change this comment) */
--- /dev/null
--- /dev/null
++From 937769ea76b5787bb334678c8685692859128b66 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Sun, 29 Jan 2012 13:42:57 -0600
++Subject: Add a printf attribute to movemail.c to allow hardened build flags.
++
++Emacs should now support the -Wformat -Wformat-security
++-Werror=format-security build flags.
++
++Reported-by: Moritz Muehlenhoff <jmm@debian.org>
++Author: Rob Browning <rlb@defaultvalue.org>
++Date: Sun, 29 Jan 2012 13:51:13 -0600
++Forwarded: bug-gnu-emacs@gnu.org
++Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=655118
++Applied-By: Rob Browning <rlb@defaultvalue.org>
++---
++ lib-src/movemail.c | 34 ++++++++++++++++------------------
++ 1 files changed, 16 insertions(+), 18 deletions(-)
++
++diff --git a/lib-src/movemail.c b/lib-src/movemail.c
++index ec38678..74ae004 100644
++--- a/lib-src/movemail.c
+++++ b/lib-src/movemail.c
++@@ -60,6 +60,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
++ #include <sys/file.h>
++ #include <stdio.h>
++ #include <errno.h>
+++#include <stdarg.h>
++ #include <time.h>
++
++ #include <getopt.h>
++@@ -152,7 +153,7 @@ extern char *rindex __P((const char *, int));
++ #endif
++
++ void fatal ();
++-void error ();
+++void error (const char *template, ...) __attribute__ ((format (printf, 1, 2)));
++ void pfatal_with_name ();
++ void pfatal_and_delete ();
++ char *concat ();
++@@ -610,16 +611,13 @@ fatal (s1, s2, s3)
++ are args for it or null. */
++
++ void
++-error (s1, s2, s3)
++- char *s1, *s2, *s3;
+++error (const char *template, ...)
++ {
+++ va_list ap;
++ fprintf (stderr, "movemail: ");
++- if (s3)
++- fprintf (stderr, s1, s2, s3);
++- else if (s2)
++- fprintf (stderr, s1, s2);
++- else
++- fprintf (stderr, s1);
+++ va_start (ap, template);
+++ vfprintf (stderr, template, ap);
+++ va_end (ap);
++ fprintf (stderr, "\n");
++ }
++
++@@ -733,13 +731,13 @@ popmail (mailbox, outfile, preserve, password, reverse_order)
++ server = pop_open (hostname, user, password, POP_NO_GETPASS);
++ if (! server)
++ {
++- error ("Error connecting to POP server: %s", pop_error, 0);
+++ error ("Error connecting to POP server: %s", pop_error);
++ return EXIT_FAILURE;
++ }
++
++ if (pop_stat (server, &nmsgs, &nbytes))
++ {
++- error ("Error getting message count from POP server: %s", pop_error, 0);
+++ error ("Error getting message count from POP server: %s", pop_error);
++ return EXIT_FAILURE;
++ }
++
++@@ -761,7 +759,7 @@ popmail (mailbox, outfile, preserve, password, reverse_order)
++ if ((mbf = fdopen (mbfi, "wb")) == NULL)
++ {
++ pop_close (server);
++- error ("Error in fdopen: %s", strerror (errno), 0);
+++ error ("Error in fdopen: %s", strerror (errno));
++ close (mbfi);
++ unlink (outfile);
++ return EXIT_FAILURE;
++@@ -785,7 +783,7 @@ popmail (mailbox, outfile, preserve, password, reverse_order)
++ mbx_delimit_begin (mbf);
++ if (pop_retr (server, i, mbf) != OK)
++ {
++- error ("%s", Errmsg, 0);
+++ error ("%s", Errmsg);
++ close (mbfi);
++ return EXIT_FAILURE;
++ }
++@@ -793,7 +791,7 @@ popmail (mailbox, outfile, preserve, password, reverse_order)
++ fflush (mbf);
++ if (ferror (mbf))
++ {
++- error ("Error in fflush: %s", strerror (errno), 0);
+++ error ("Error in fflush: %s", strerror (errno));
++ pop_close (server);
++ close (mbfi);
++ return EXIT_FAILURE;
++@@ -809,14 +807,14 @@ popmail (mailbox, outfile, preserve, password, reverse_order)
++ #ifdef BSD_SYSTEM
++ if (fsync (mbfi) < 0)
++ {
++- error ("Error in fsync: %s", strerror (errno), 0);
+++ error ("Error in fsync: %s", strerror (errno));
++ return EXIT_FAILURE;
++ }
++ #endif
++
++ if (close (mbfi) == -1)
++ {
++- error ("Error in close: %s", strerror (errno), 0);
+++ error ("Error in close: %s", strerror (errno));
++ return EXIT_FAILURE;
++ }
++
++@@ -825,7 +823,7 @@ popmail (mailbox, outfile, preserve, password, reverse_order)
++ {
++ if (pop_delete (server, i))
++ {
++- error ("Error from POP server: %s", pop_error, 0);
+++ error ("Error from POP server: %s", pop_error);
++ pop_close (server);
++ return EXIT_FAILURE;
++ }
++@@ -833,7 +831,7 @@ popmail (mailbox, outfile, preserve, password, reverse_order)
++
++ if (pop_quit (server))
++ {
++- error ("Error from POP server: %s", pop_error, 0);
+++ error ("Error from POP server: %s", pop_error);
++ return EXIT_FAILURE;
++ }
++
--- /dev/null
- 0011-Don-t-clear-FONTCONFIG_LIBS-and-FONTCONFIG_CFLAGS-in.patch
- 0012-Fix-a-tty-related-preprocessor-inclusion-error-affec.patch
- 0013-Expect-0-from-kill-for-zombies-on-GNU-Hurd.patch
- 0014-Add-i386-to-cpp_undefs-in-configure.in-to-fix-i386-m.patch
- 0015-Look-for-crt1.o-in-the-correct-multiarch-location.patch
- 0016-Use-CRT_DIR-to-find-crt-.o-on-ppc64.patch
- 0017-Define-POSIX_SIGNALS-for-GNU-Hurd.patch
- 0018-Don-t-let-CEDET-execute-code-from-an-arbitrary-Proje.patch
- 0019-Add-a-printf-attribute-to-movemail.c-to-allow-harden.patch
+0001-Prefer-usr-share-info-emacs-23-over-usr-share-info.patch
+0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
+0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
+0004-Adjust-documentation-references-for-Debian.patch
+0005-Cause-the-build-to-fail-if-liblockfile-isn-t-selecte.patch
+0006-Avoid-silently-losing-mail-via-fakemail.patch
+0007-Modify-the-output-of-version-to-indicate-Debian-modi.patch
+0008-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch
+0009-Invoke-the-correct-xmlstarlet-executable-on-Debian-s.patch
+0010-Fix-startup-hang-on-Debian-GNU-kFreeBSD.patch
++0011-Use-CRT_DIR-to-find-crt-.o-on-ppc64.patch
++0012-Define-POSIX_SIGNALS-for-GNU-Hurd.patch
++0013-Add-a-printf-attribute-to-movemail.c-to-allow-harden.patch
projects / emacs.git / commitdiff